[PATCH] remove JITC_PROCESSOR_TYPE export for powerpc

long obsolete; there's no IBM JDK for 32-bit ppc anymore. And it breaks
creating instdir/program/soffice with +x by cp (sed doesn't keep the
permission, obviously)

Change-Id: I9e8ffc6017056adb5142099a661761c2caaa87c4

Gbp-Pq: Name remove-JITC_PROCESSOR_TYPE-setting.diff

diff --git a/config_host.mk.in b/config_host.mk.in
index b7955d9940d3ad36892b9de2a892722eda7f5db7..8c98cea76d1d14c7306e823329194b51263e8616 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -389,7 +389,6 @@ export JDK=@JDK@
 export JDK_FOR_BUILD=@JDK_FOR_BUILD@
 export JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD=@JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD@
 export JFREEREPORT_JAR=@JFREEREPORT_JAR@
-export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
 JOM=@JOM@
 export JQ=@JQ@
 export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@

diff --git a/configure.ac b/configure.ac
index fcabb099c6b1b23c10e6351cdfb85abe28d8dd5c..cfa9ce46fdc75786bc42c2e8255af3ba5e7d2bbd 100644 (file)
Binary files a/configure.ac and b/configure.ac differ

diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk
index 26e661ec39dc7d8c0899bc1b579a05fdb1a9079e..0c895c77afc034fa584a495b945423575b10fc87 100644 (file)
--- a/desktop/CustomTarget_soffice.mk
+++ b/desktop/CustomTarget_soffice.mk
@@ -35,11 +35,7 @@ $(gb_CustomTarget_workdir)/desktop/soffice/soffice.sh : \
                | $(gb_CustomTarget_workdir)/desktop/soffice/.dir
        $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
        $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED)
-ifneq ($(JITC_PROCESSOR_TYPE),)
-       sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@
-else
        cp $< $@
-endif
        $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED)
 
 endif

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 7188f393e1405e93150e0ae93d721caeb4f55f3e..1f3c4cd1f0ec4a5d9d76dfecd79ab223b348113a 100755 (executable)
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -37,8 +37,6 @@ export SAL_ENABLE_FILE_LOCKING
 # uncomment line below if you encounter problems starting soffice on your system
 # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
 
-#@JITC_PROCESSOR_TYPE_EXPORT@
-
 # resolve installation directory
 sd_cwd=$(pwd)
 sd_res="$0"